updated as per roy input