Working on revising the interface