editing for module 3 and 4
merged with master