Getting ready for the production - Fast update