More work on all the modules