Maybe get these final changes to stick...