TBD marker logic, just in case