More editing and moving