reverting code back to old and fast code