update with some goals of this branch