renamed elements and optimized events