changes to work with new production API