Richard commit 3