Tony update SPA rule and modify calendar