some changes for building