Removed TODO since flag is now implemented