Some changes to draft