Build Script updated to work with setup