Ricepaqper 2.3

Issue 2.3