We need to improve this AWD-5 related

AWD-2 and AWD-3 related to this.