second part of first official commit