An update that should make more happy and less angry