FUrther modifications for demo to Reem