Improved performance
Embedded version 100% complete