Improved fold performance somewhat
V0.2.1