updated to reflect feedback