No need for this weird split with the new code