Changes from John meeting