Adding some tweaks thanks to @leanna