Feature/date conditions 3 2

...