Extracted draft to own branch