(GFW-369) Adjusted with Bootstrap