Updated for beta.
Tweaked Index