Updated to more fancy check