Changing to dwr2