better config + #5 + #4