[point/optimizing]: add all the resolves