Changed the way run variables are picked up