Re-work of Modules