Changed stuff for production