merged some... changed