a bit better but not there yet