rework for browser testing, fix shift bug