FIX: Correct usage of On in replacement of Live