changed to use longform vars