Updated events and removed testing code.