added missing files from previous merge