Richard test branch

merging