draft major update with requested features