Final changes, I hope