Updated to Flag system