Some progress but still not ok