new flags mode improvements 2