Moved new version back in
Moved stuff around