added and moved stuff