Update
Changed implementation