replace .live with .on
merge