added a feature - will be for a pull request