Final final changes?!? Just added some comments