Made date work…if / else-if