Updated changes in-line with Aaron's Email