another merge from Sattam's revision