Viaducts again, code based to release 1.6.1