Added Other Cases