update from production

better optimizer