edited Shaffer pt 1