updated with phrase support