WordMap update 17