New feature for version 3.1