Added DEVELOPER mode