Work on coverting to mass checking system