add insert bolt + refactor