Made my own tweaks