bug fixed - have not return nil
'Delivered today' state is added