refractoring
order add type works