Mansi , Sandesh | Fixing shashank's OCD - PART 2