modify build fis and sug refactor