adjusted sysconfig
merge