almost final changes
merging