Enhancemens to 3ffdd10f7fae361dbc3ab47bf2c17fc350ca09c8