Switched to using uggo's flagset