updated with storage path usage.