Seems to work now, validation left...
Still work left to do...
Finally!!
Finished feature optimise.