Changes
Merging errors corrected