Solar Energetic Particles: recent observational progress for shock-related and impulsive events Glenn Mason 1, Mihir Desai 1, Joe Mazur 2, and Joe Dwyer.