added the rest of the update