change storage location to the Volatile one
drop 'amatch' dependency