Adam file
solved conflict w/Adam's version