updating according to SDK changes