Added support for less clutter
Added confusion
Merge