Corrected/simplified versions of modules