Updated for post-conference