tidy up and new functions