Needs to fix indices