Update layering

Make layering penalties consistent with master branch for testing purposes.