Shift to SDL2.0