change up flow; better debugging.