Changed to more robust linear impulse system