add basebuilding not complete and little modifications