yep you're right, I had refactored that a bunch of times and I should have just simplified it.