Updated interface with demo interface from 14/06