Update from Sandbox version.

Better code and seems stable enough... Next to start working on merging Develop into Sandbox...