enhance local & remote deploy