before merge standar
change touch
fix touch bug