Tweaked build, index built