added specific versions / commits to fix code that has been left behind