Updated fn defs to return Xpns