Only with the minimal pathes needed, based on !284 (closed) keeping Sebastian's authorship
Closes: #269 (closed)
