Update to fit requirement of draft list