Modified stations in order to let JP work on events