addressing more comments from aaron