added more criterea to check