Restructured to fit sync browsing