Better code for Bookmark