Fixed 2nd module and 3rd modules, started on 4th module

Fixed 2nd module and 3rd modules, started on 4th module