overwrite with Thomas changes