more checks addded