Improved Graves and Tristana