added dwb stuff