Added map W to save
Fixed confliction