changes to signature for goal type matching