Final Commit as of Jam End