make it back-compat as possible instead