added hadleys and jdroach