Tidy up
Updated versions