Updated message as per new requirement