some tweaks added