preparing to add termination checks