adding when ever and moving the configs to be relevent