Tweaked a couple things concerning assignment