Added TODO
fixed index