Additional work on reset logic and event setup