update for toa and toa-static