Changes to use send rather than add