Still ugly, but a bit more is done