commit update #2 after ridiculous debugging