Now updating in the right way