Final changes…for now