4th pull

added trevors changes