Added rshaw
Moved jscott