Update to new interface
Added a few comments