challenge pictures and fixes
merge changes