Adding no weights option.
Updating systematic names.