tweaking for production release