Sanchari/Pranjali/Priti/Sailee:Cukes refactored