updated for index and show