Fixing method names
Setting env = production on storage
|| not &&
No exceptions for production