Further speed improvements