Thanks for this. Seems like Malsingmap does a pretty good job.