#60 - Fix step 1 interface to make it work