modifications to accommodate bulk dependency updates and changes