also read data changed on server correctly

started better structure