Fixed the update method, reimplemented the remove method.