Adding before for module 6
Reorganizing everything