week3 v4

Final touches