WORKING: with production values