changes applied from previous extension