added rshaw and cdahlqvist again