changed goal conversion definitions