Logic change in build procedure