updated w and r