implement check at second location also