added whenever + configuration