restore removed code during merging