Fix Module 2 and 3