Fixed everything for w2m