adjusted to new repex variables expansion once more