Continued work on modules