Flags added and improved