Working version of update system