added prod/dev support