Added ctonroller stuff
Fixed a retake bug