Intreduce Double Click and a few new options