moved stuff
added labels