247 mergetest

real data challenge for challenge-edit test-merged with master