More work on draft