small changes not quite working at the moment