Reverting back as last attempt failed miserably
Tidying up