Draft: Fixed Draft edit again! (better this time...)