Final changes, hopefully