build commands refactored
build commands refactored