New build. Minor improvements