added final store stuff