Looking better now