What events make up the pentathlon?

I think the original question related to to original Olympic games, while question 1 address the pentathlon of the Moderen Era. I believe the pentathlon events of the original Olympiad in Greece included Wrestling, javlin throw, discus throw, running, and the fifth I cannot recall at this time. The events of the Pentathlon in the ancient Olympics were: 1) a foot race that history has deemed to be approximately 150-200 meters

2) wrestling

3) long jump

4) javelin throw

5) discus throw