moved stuff around a little more