Functional crop with bug-fix

I'm tired of writing these comments. Figure it out