Sam & Seema: Beginning of modifying the back logic