Updated modules based on feedback from engineer.