presentzation done
merge fixwd