WD #2: Some changes