Updated to v3, also added some tweaks to events