added affix and collapse
removed vishy directives