Updated production stuff