.onStep(), .draw() offset, & reorganization