Update fw

Changed order of add_extra so it works