Added flags and formatting