Switch over to flags 2.0