add proper indexing for our goals