removing dependency on resolution