Updated to include more detailed message