last change on core functionality developer 123
last change 2...
Merging changes with squash