Uses resolve better