Actually use the storage path this time