Amended methods

In advance of a flat storage list