Re-build of my blown engine + upgrades