Updated for build & run commands