Switched to using two variables