removed || clause