added trevors changes