Adding changes done in proportions-network branch + detecting 2nd circular manip