Make it modular - passed