refactored for browser folder