added rest of assignments