Played with the IDs so we have backwards AND RP2 compatibility