move more to config file