modified click and switch