FIX: Performance inprovements.