Bug fix: change live function to on