zest setup and other modifications