Last Minute Adjustments by @cloudstryka