Modifications based on comments and updated understanding of the interface