w/ jayson changes r2