first internal changes

cipy changes