Salanderous final changes