Added tortoise and hair cycle detection