Some changes in building
Some chnges