wip
shift index better