fixed assignment 1, merged changes