major last minute chages of course
merge