Performance tuning
Update for 0.6.12
Update for 0.6.12
Update for 0.6.12
Update for 0.6.12