Added content, improved compatibility.