Updated and started work on flags