Restructure and change to using plot index over plot band