changed circtype
merge