lecture 7 exercise
fixed staging bugs in develop branch