More work done on Case Study