Moving things around to make it more clear