Performance inprovements