Tweaked both codes, inconsequtial changes