tightened up my chase logic (reduced duplicate code)