A small update with some performance improvement.