merging my work with Kevin's