Condition improved for specific entries