Keep track of modes as well