Feat/edit feature condition