Updates in rootdir (part 3)