change conditional convention