Added changes to trach issue #1