added aaron's latest changes