Some magical tweaks thx Googy Anas