now with photos and challenges
merged