More keyboard changes