Trying some performance improvement ideas.