Configs + part2 of last commits