Modified code according to Roster
Modified code according to Roster