improved resolver