#2 added support for avoided systems