Modified the filter and controller files