Phase2 shk21

Optimized code for module making