Fixed messages as per new requirements