Fixing data population script