added changes removed by previous merges