refactoring and extra seeding