first commit - part 1 changes included