try to move more to the yml file