moved stuff to config