Updated code and documentation Week 3 and 4