Update for ease-of-use