added changes from our final submission