overrite resources, compat and simplify logic