Improved performance for R=7

The R=7 coding was degenerated in the previous version. More tests to come.