Tweaks thanks to icedwater