cancelled old branch changes; optimization; comments;