reverting some tweaks