some progress but slow...