NoRookie now does the rookie check asap
Merge branch 'develop' into captainsmode