added aaron's changes