modifications as per Ria's Request