improve builder script