Added character.only to p_funs