reworked index to match application