Added FEATURE setting, to keep upcoming features seperate