(CS) Add some optimization to agenda view