added all unindexed stuff too