some tweaks made