tidy up of new feature