Added events
Added jup