added bookmarks and flags