Corrected messages as per new requirements
corrected messages as per new requirements