Updated so that not in dev mode