Added aaron's changes