Improve build, connect