reverting to old catSubst, see code comments...