Fixing duplicate selectors. adding (commented) code which is non-short