Fixed today/tomorrow logic