Overhaul of whole Document finished