working much much better