moved stuff part 2