Changing the empty conditions list approach as not all drivers were happy