moved stuff here and there