last minute changes
merge