Made the build command a little smarter