Changes to build() function completed