small changes and migration controller off