Reverted to original way of exporting variables