Some organization. Changed around how to filter