added resolver and removed promise dependency