Updated build for greater cohesiveness.