Part 1, disturbance bug fixed