@@ -52,21 +52,13 @@ public ISynchronizeInvoke SynchronizingObject
         private readonly Timer _eventTimer;
         private StatusResponse _eventStatusResponse;
 
-        public delegate void TrackChangeEventHandler(TrackChangeEventArgs e);
+        public event EventHandler<TrackChangeEventArgs> OnTrackChange;
 
-        public delegate void PlayStateEventHandler(PlayStateEventArgs e);
+        public event EventHandler<PlayStateEventArgs> OnPlayStateChange;
 
-        public delegate void VolumeChangeEventHandler(VolumeChangeEventArgs e);
+        public event EventHandler<VolumeChangeEventArgs> OnVolumeChange;
 
-        public delegate void TrackTimeChangeEventHandler(TrackTimeChangeEventArgs e);
-
-        public event TrackChangeEventHandler OnTrackChange;
-
-        public event PlayStateEventHandler OnPlayStateChange;
-
-        public event VolumeChangeEventHandler OnVolumeChange;
-
-        public event TrackTimeChangeEventHandler OnTrackTimeChange;
+        public event EventHandler<TrackTimeChangeEventArgs> OnTrackTimeChange;
 
         public SpotifyLocalAPI()
         {
@@ -104,7 +96,7 @@ private void ElapsedTick(object sender, ElapsedEventArgs e)
             {
                 if (newStatusResponse.Track.TrackResource?.Name != _eventStatusResponse.Track.TrackResource?.Name)
                 {
-                    OnTrackChange?.Invoke(new TrackChangeEventArgs()
+                    OnTrackChange?.Invoke(this, new TrackChangeEventArgs()
                     {
                         OldTrack = _eventStatusResponse.Track,
                         NewTrack = newStatusResponse.Track
@@ -113,22 +105,22 @@ private void ElapsedTick(object sender, ElapsedEventArgs e)
             }
             if (newStatusResponse.Playing != _eventStatusResponse.Playing)
             {
-                OnPlayStateChange?.Invoke(new PlayStateEventArgs()
+                OnPlayStateChange?.Invoke(this, new PlayStateEventArgs()
                 {
                     Playing = newStatusResponse.Playing
                 });
             }
             if (newStatusResponse.Volume != _eventStatusResponse.Volume)
             {
-                OnVolumeChange?.Invoke(new VolumeChangeEventArgs()
+                OnVolumeChange?.Invoke(this, new VolumeChangeEventArgs()
                 {
                     OldVolume = _eventStatusResponse.Volume,
                     NewVolume = newStatusResponse.Volume
                 });
             }
             if (newStatusResponse.PlayingPosition != _eventStatusResponse.PlayingPosition)
             {
-                OnTrackTimeChange?.Invoke(new TrackTimeChangeEventArgs()
+                OnTrackTimeChange?.Invoke(this, new TrackTimeChangeEventArgs()
                 {
                     TrackTime = newStatusResponse.PlayingPosition
                 });
Original file line number	Diff line number	Diff line change
`@@ -52,21 +52,13 @@ public ISynchronizeInvoke SynchronizingObject`
`52`	`52`	`private readonly Timer _eventTimer;`
`53`	`53`	`private StatusResponse _eventStatusResponse;`
`54`	`54`
`55`		`- public delegate void TrackChangeEventHandler(TrackChangeEventArgs e);`
	`55`	`+ public event EventHandler<TrackChangeEventArgs> OnTrackChange;`
`56`	`56`
`57`		`- public delegate void PlayStateEventHandler(PlayStateEventArgs e);`
	`57`	`+ public event EventHandler<PlayStateEventArgs> OnPlayStateChange;`
`58`	`58`
`59`		`- public delegate void VolumeChangeEventHandler(VolumeChangeEventArgs e);`
	`59`	`+ public event EventHandler<VolumeChangeEventArgs> OnVolumeChange;`
`60`	`60`
`61`		`- public delegate void TrackTimeChangeEventHandler(TrackTimeChangeEventArgs e);`
`62`		`-`
`63`		`- public event TrackChangeEventHandler OnTrackChange;`
`64`		`-`
`65`		`- public event PlayStateEventHandler OnPlayStateChange;`
`66`		`-`
`67`		`- public event VolumeChangeEventHandler OnVolumeChange;`
`68`		`-`
`69`		`- public event TrackTimeChangeEventHandler OnTrackTimeChange;`
	`61`	`+ public event EventHandler<TrackTimeChangeEventArgs> OnTrackTimeChange;`
`70`	`62`
`71`	`63`	`public SpotifyLocalAPI()`
`72`	`64`	`{`
`@@ -104,7 +96,7 @@ private void ElapsedTick(object sender, ElapsedEventArgs e)`
`104`	`96`	`{`
`105`	`97`	`if (newStatusResponse.Track.TrackResource?.Name != _eventStatusResponse.Track.TrackResource?.Name)`
`106`	`98`	`{`
`107`		`- OnTrackChange?.Invoke(new TrackChangeEventArgs()`
	`99`	`+ OnTrackChange?.Invoke(this, new TrackChangeEventArgs()`
`108`	`100`	`{`
`109`	`101`	`OldTrack = _eventStatusResponse.Track,`
`110`	`102`	`NewTrack = newStatusResponse.Track`
`@@ -113,22 +105,22 @@ private void ElapsedTick(object sender, ElapsedEventArgs e)`
`113`	`105`	`}`
`114`	`106`	`if (newStatusResponse.Playing != _eventStatusResponse.Playing)`
`115`	`107`	`{`
`116`		`- OnPlayStateChange?.Invoke(new PlayStateEventArgs()`
	`108`	`+ OnPlayStateChange?.Invoke(this, new PlayStateEventArgs()`
`117`	`109`	`{`
`118`	`110`	`Playing = newStatusResponse.Playing`
`119`	`111`	`});`
`120`	`112`	`}`
`121`	`113`	`if (newStatusResponse.Volume != _eventStatusResponse.Volume)`
`122`	`114`	`{`
`123`		`- OnVolumeChange?.Invoke(new VolumeChangeEventArgs()`
	`115`	`+ OnVolumeChange?.Invoke(this, new VolumeChangeEventArgs()`
`124`	`116`	`{`
`125`	`117`	`OldVolume = _eventStatusResponse.Volume,`
`126`	`118`	`NewVolume = newStatusResponse.Volume`
`127`	`119`	`});`
`128`	`120`	`}`
`129`	`121`	`if (newStatusResponse.PlayingPosition != _eventStatusResponse.PlayingPosition)`
`130`	`122`	`{`
`131`		`- OnTrackTimeChange?.Invoke(new TrackTimeChangeEventArgs()`
	`123`	`+ OnTrackTimeChange?.Invoke(this, new TrackTimeChangeEventArgs()`
`132`	`124`	`{`
`133`	`125`	`TrackTime = newStatusResponse.PlayingPosition`
`134`	`126`	`});`