First cut at changes to a5288 report