Better handling of redundancy
Better handling of redundancy