Changed to proper template. Added message