second part of the initial commit