Final commit for Jam