Moved stuff to correct spot