Removing redundancy. Making support option.