Changes to reflect a change in name and simpler implementation

plus function documentation