moved more to config