Replaced live functions with on functions.