Reverted to On CLick.