- some small changes in assignment