Refactored 2nd module