Edited develop branch as in lecture7