Threw old stuff away, followed NNH for implementation