new version with better HTML handling.