Try to move redundancy and move configs as suggested by Kirek