added missing changes from previous commits