Final Commit. Bugs fixed. v 3.5