new feature
Fixes merge conflict from Mark