much much better - most % done