adding cases;
remove column key and fix cases;