week4 added + some config changes