Fixed Messages and Updated example