added editing, saving to server with timeout