Two case (8/28)

Two case