First comprehended commit (incl. some errors though)