Added some more assignments