tweak system finished
todo changes