updates made after the previous merge to make unit tests succeed