Moved crippling code to more appropriate method