Moved pass detection back to where it was previously