Temasek Spare parts - Derp fix
[WIP] Build V3.6