Revert "Testing the new interface"

This reverts commit b87e867bda3ec1ca1598466f71a5a28bc6130e2b.
fixit