Two case (10/28)

Two case