more disturbances and some refactors