major enhancements to first report