assignment 5 and 6 added