make it work in production enviroment