Did some upgrades, just wanted to share