Moved points for demo, added stepped moves