changed the way the server handles storage