First iteration is working correctly. Need to adjust the update method to the new paradigm