fixing production data
Merge branch 'production'