few changes for building