UPD: Script updates from raijin