Updates in rootdir (part 2)