Updated w/ comments