Updated to use a selection filter applied.