Updated with new actions rather than filter.