whole thing is working now