populate.php shoud know about refactoring now :D