changed live functions to on functions