Now takes advantage of storage_path()-helper, optimized a bit