splitting update into 2 issues