improve click mechanism