Change to draft and small changes