Thematic mapping improved - testing in progress