Implementing some changes from production