Glitch Fixing

Not working yet.