Increased speed dramatically for #22