Edited to reflect changes to interface