Capital Allowances

Turbo_Dave

Hi I have my business tax FA 2016 resit on the 25th September and I am just wondering what the proforma layout I should be using for capital allowances.
Should the vertical columns be produced in the following order:
TWDV b/f
Additions
Disposals
AIA allowance
FYA allowance
WDA
TWDV c/f
Allowances

Or should it be
TWDV b/f
Additions (not qualifying for AIA/FYA)
Disposals
AIA Additions
AIA allowance
FYA allowance
WDA
TWDV c/f
Allowances

And then the horizontal columns should be AIA, Main pool, Special rate pool, Private use, Allowances.

Thanks for the help.