Reports 199

Revised code based on review comments