OPT return types in dataset
ADD weight calculations