New interface

This fixes issue #4