#10 added fields
#10 fixed message