Start handling X-Ray checks better