updating according to new conventions