Adopted to the new phrases