bookmark part 4 and final, small refactoring