Forgot what I changed, hopefull didn't break anything
Abide to Master Duncan's wishes