added module 3, edited module 2