finish combining and ready for fix bug