redid tick/step stuff.