Modified build procedure