Wrangled the build method