fixing Don's review comments