Update tempting for cleaner code