new modules and tidy up