STABLE optimized version
Merge branch 'optimization'