Completed all the mentioned points in the challenge