recovery code merged with master