Moved this to here, so that it will only update after having been saved.