Updated to simpler interface