Two case (9/28)

Two case