move callbacks
Merge pull request #72 from grahamb/hotfix-restart

move callbacks