updated some backwards compatibility.