Improved the speed of the arduio code
Solved merge conflict