fix market problem + fix ww problem - now can go to ww