Update functionality for #87