Final Tojam last minute changes commit.