Maryam: Changed the Data gather