adding some more tweaks