updates to make it more compatible with production deployment