adding some additional tweaks