Now lets fix production