fix 1, 2, 3, 4, 5
update config to try fix 7