Put events back to 4 + add TODO