Improve flag throwing. Still not really functional