Tweaked index & register