Added some disjoint components. Improvements on the way