flags improvements 2