editing for module 3
merged with master