Moves from .live to .on (A better version of pull #144)

The code suggestion at the bottom of #144 doesn't work. Here it is cleaned up.