Final benchmark changes