Re-add 998/999 support

First time C++, hope this works lol