Modified: Improved before filter.

Improved **before filter**.