Tom's updated units