This is codicorn's commit after cadacorn's commit!