#298 - more review updates