Adding fitShapes
change fitShapes fileName
Improving fit speed and stability