Added changes missing from last commits
Added work done on task 4