Change layer number passing to the wrapper. Add start_layer and end_layer.