working on integration with mips_v2 branch