implemented changes from the google drive for final production