merged bo's changes into my current copy of report