reverting to old checking style