Further updating to conform to current conventions