Changed interface to work with what is already there