Tentative compat mode

Tentative work, not merge yet