Remove medium mode and update infect
Merged with master
Merged with master