add other assignments
remove junk