Working Code (More Tweaks)