change to the right tags