adding wshaper (again )