circular - simple circular trajectory only
circular - added square trajectory and transitions between square and circular