last nights final changes
fixed merge conflicts