Custom amends for Richard

Custom amends for Richard