The rest of previous commit