working better, but not there yet