Adding current conditions