assignment 1, jp added