changed models, admin and population script