Before adding date picker