No more manips
Merge branch '4621' of https://github.com/avh34/CS-4621 into 4621