Finally (fully) implemented the updating functionality! :D