second part of first commit