Working better now