almost done
merge fixwd