tested and working - now last autoformat stuff