Update, and added missing flags