restored it to the original. this is faster than what i was trying
some cleanup