Temporary commit #2 - non-index changes