Removed duplicated surrounding the magical Flag parameter, added a TODO: