A bit better but not finished.