Final changes by Connor Finnell