better, still wonky