Saamahn's Change#2
Saamahn's Changes#3