moved stuff around to make it better