Made some changes... keeps crashing my machine :p