tidy up and change name a bit