Adjusted populate
Refactoring