Thematic mapping improved II - testing still in progress