Mode checks are  more reliable now