add interval tracking and date in future error handling