moved stuff to proper positioning