starting to fix r2 for new system