added dynamic index swapping and additional content