third try #80

it's not passing the integration tests...switched some stuff up
Merge pull request #870 from gruiz17/patch-2

third try #80