Finished version that we turned in