RE: Included z index support