Restored these to prior happiness