[Improvements] Draft