pulling up changes from r7