property changes
getting the git ready for merging