Incorporated some of Ross Paterson / Yitzchak Gale suggestions