changed magic modifier
Refixed stuff