minor reorganization and includes filter