todo: reindex return path, change stack structure