Added stuff for Richard