Working better, but still some issues