added additional tweaks