Modify Challenges faced
Fix server
Fix Server