Added Spaz protection and Drag removal