Simplified condition while retaining behaviour