IAS 16 revaluation and depreciation

Hi Sir,

Here’s my question:

X bought an asset on 1 Jan 20X6 for $10,000. Useful life: 5yrs.
1 Jan 20X8, asset was revalued to $12,000. Useful life unchanged.
Accounting for revaluation and depreciation for 20X8 onwards:

On 1 Jan 20X8
Dr Asset (12000-10000) 2000
Dr Accumulated Depreciation (10,000*2/5) 4000
Cr Revaluation Surplus 6000

At end of 20X8,
Dr Revaluation Surplus ([12000/3]-[10000/5]) 2000
Dr Retained Earnings (10000/5) 2000
Cr Accumulated Depreciation (12,000/[5-2]) 4000

Please let me know if the second part ( End of 20X8 ) was rightly accounted.
Issen