reverted changes. may put back in if time to write tests to cover cases.