Moved stuff to make it easier