last part of initial commit