finalisation...
more fine tuning...