Started implementing update logic