v1.2.05 Final Commit