adding waiver and room to tool