Second Commit wqorking for local stirage as well