Changed to use new layer instead of recycling exiting