Couln't we return here instead?