Updated to use ReplySource changing