Reverted to origin way of exporting variables