Latest version with many performance tweaks