modified default setup