Last update, from STRP tweaks