blah

changed some logic