Reintroducing the features. Fixes #2