Changed how scoping was done to be more in line with Thorax patterns