trying to improve performance...