big refartoring anf optimization of isce exp