made -a and -t work with new flat modes