Major changes for X-ray checker