changes as per new rquirement