updated from matthew/aron review